Fixing some #5, fixed #4
Signed-off-by: ArchimedesPi <archimedespi3141@gmail.com>