Fixed parsing (until I break it again), and replaced numbers with constants for easy modification