Big update, added multiple bug fixes and functions