Feature/general fixes

@Battlefy/developers-developers-developers