Added more feature detection algorithms, cleaned code a bit, less redundant