Bug fixes based on #96#107

meetzaveri merged 5 commits into

maincraftbase-org/craftbase:mainfrom

devcraftbase-org/craftbase:devCopy head branch name to clipboard