Bugfixing and clean public folder