Fixes some amateur level mistakes (-.-')