fixing scaling issues WIP